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

* commit '630ff318727280fc55eb2ed69019ed43f1802c93':
  Fix NPE in FlashlightController