Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev...
Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev am: 25018d41 am: e90dee00
am: f19b48df
* commit 'f19b48df':
Change-Id: If85188ccc995b4f50070ca85de199280b03290f2