Merge "Merge "Fixed connectivity state in some restricted network scenarios."...
Merge "Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e81 am: 9a48ee1b" into nyc-mr1-dev-plus-aosp
am: 2099c5d8
* commit '2099c5d8':
Change-Id: I681d58e763bec7b22b2962c98661576f534d6669