Fixes: 156099130 Fixes: 158333017 Test: manually apply styles Change-Id: I9c04addba099722551449d32f7265dffb84d818e