Merge Holo UI withe

Change-Id: Ied12ac3a89b0b7fd095d2ab417f407882afdd53e