am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev

* commit 'c11a94e98a911756e645216d36dbf0a438a3fb3e':
  Fix NPE caused by status update outside activity lifecycle