am b8997ce7: am 561f8821: Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev

* commit 'b8997ce7ac3c917edf71a2880b68541678c5fec3':
  Prevent possible NullPointerException when service is destroyed