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

* commit '6e12f9d36da3214367fc4ad5510220a397970aa2':
  Fixed connectivity state in some power saving scenarios.

Change-Id: Idd27e581b208a0d80d8fa6a4d7cf75eac82a32fd