Merge "Force a light to be set for the first time"
am: e6ad7a6704

Change-Id: Icc13b24debc55f4c107dea61123e468a79828f11