fixed cherry : Theme Engine [4/8]

Change-Id: Ifa2e4adf2f5efdef81976de3205875fd784549b5