Merge changes from topic "lights-manager" am: 59401aab80 am: bd0f475895

Change-Id: I2f4ba72c3b56b5ae0f9ec82e368281734b9a9715