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

Change-Id: I3b4ef0bd22da42883c4ae76640343ec4484e7e2d