Merge "Illumination hover state" into rvc-dev am: 7c7ca77ed5

Change-Id: Ia35c475cf78990899b820b8d5b2f6c7865aa591d