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