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: cf39ea64
* commit 'cf39ea64':
Change-Id: I84bb94fff82e9a7965147b0bb1736ab5529b6c8d