Merge "CTS: WifiLockState"