am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController