Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: If76cc55916bbd7e5e4093b39ff81a40c1e43034c