Merge "Add debug output for lights."
am: 25ccf20c8c

Change-Id: I1b251c7053975cdeef43cb2cf4786860bbb1192d