Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev...
Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb am: 6c3cb2c3
am: 642d137d
* commit '642d137d':
Check if we're connected before marking a UID blocked
Change-Id: Iac1d2387efe0bfebf4c77a76f0cbb977036c6ed1