fixed-cherry : Theme Engine [6/8]

Change-Id: I80c244419f6109a86eec52cf3571a9fa0f13a045