[1/2]Fix Lights
[2/2]Fix Lights
Update NFC
Merge pull request #1 from AndroidOpenSourceXperia/master

Merge with AOSX