Merge "Protect against NPE while to updating service connection activities." into nyc-dev
am: cef12198a7

* commit 'cef12198a729209fc8bfb2b2483fb3730f0fd428':
  Protect against NPE while to updating service connection activities.

Change-Id: Ibeac7bcf9d2f85ac39d9b029cd429ae538ad8a99