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: I3a430751bf02631bee57355c901d3f78248a3261