[automerger skipped] Merge changes from topic "lights-manager" am: 59401aab80 am: bd0f475895 am: 06dd4617c0 -s ours
am skip reason: Change-Id I2db7f2caa432cd1e2389ea5ca6544200ada18675 with SHA-1 090d02ca84 is in history

Change-Id: I863d70ee369ad7c8d69d8ecbc8d05bcc93faca2b