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

Change-Id: I5caed909e1ba67931f05b0b44a0ff0fd62b131d0