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

* commit '104a29b6b5fe6e454787053ca72950dbbc4d424b':
  Fix NPE in FlashlightController