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