ThemeUtil Update.

Change-Id: I7370b4df8bebfa00d7833f90e520f9cf4dfc8b36