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

* commit '0bb76dc6d0c28af61ab7c0d5fa6379669f18b4d6':
  Fix NPE in background thread