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