fix bar light test [1/2]
fix bar light test [2/2]
Merge pull request #2 from AndroidOpenSourceXperia/master

Merge with AOSX