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

Change-Id: I9a45024b3cb557afd4fb09e69692f35c4372c928