am e9b1457c: am 0c0ec9d2: Merge "Prevent possible NullPointerException when...
am e9b1457c: am 0c0ec9d2: Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev
* commit 'e9b1457c':
Prevent possible NullPointerException when service is destroyed