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

Change-Id: Iedc1c90b92301477dc1d69d869061b405446e1dc