fixed-cherry : Theme Engine [3/8]

Change-Id: I85b9ab1c071d7a6acf33b2949095d3ddf7d6f7b5