Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70
am: 174385a208

* commit '174385a2084439678bea758733edd893b255d22a':
  Check if we're connected before marking a UID blocked

Change-Id: I31b69b3e7bb307c80c472941f57e480888918a34