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