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

* commit '561f8821e976cfcdd5503e1b645417ef6506a995':
  Prevent possible NullPointerException when service is destroyed