Merge "Merge "Protect against NPE while to updating service connection...
Merge "Merge "Protect against NPE while to updating service connection activities." into nyc-dev am: cef12198 am: e3190c20" into nyc-mr1-dev-plus-aosp
am: 5fd35099
* commit '5fd35099':
Change-Id: I2921851366489234c7d2b41b437922d42df5afce