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

Change-Id: Ib03f7ded6bb232193eec32a4f566244d3caa94b5