am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController