am 4fa79b1f: am 3b2c2024: am 0bb76dc6: Merge "Fix NPE in background thread" into lmp-mr1-dev

* commit '4fa79b1fadb9acc9a69e3034b3c143933472d439':
  Fix NPE in background thread