Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70 am: 6c3cb2c392
am: 642d137d8c

* commit '642d137d8c924d32e9c92effd77db89644f438c4':
  Check if we're connected before marking a UID blocked

Change-Id: Iac1d2387efe0bfebf4c77a76f0cbb977036c6ed1