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

* commit '6c3cb2c3926182245a0e80a7e3c95ff04d032b06':
  Check if we're connected before marking a UID blocked

Change-Id: Ib2b6ddd0d5a6e7a4b825a3113d275d753c5c08b0