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

Change-Id: Ib37c58aeb9aa13542ae730426cc7c4e2ae39e19c