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