Merge "Force a light to be set for the first time" into oc-dev am: 9ddb0f8691  -s ours
am: bf7443156d  -s ours

Change-Id: I770eabd9e59158a984581d1e9ae14b9bf02adfd5