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

* commit '3b2c2024a6b93d1055bfbfb7bd8261f616365db8':
  Fix NPE in background thread