Merge "Prevent possible NullPointerException when service is destroyed" into lmp-mr1-dev