Merge "Update OWNERS for lights" am: b8a28aa2a7 am: 2b2efea4b1

Change-Id: I210fd8abadf59df688afd0adf0af793b07ddae61