Merge "Temporary fix for themes" into oc-dev
am: 02e5b5c6da

Change-Id: I15a2861696d4bc163107d4d7dd18fbce7c363b27