Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0