Merge "Wifi Keystore HAL is not a HAL" into oc-dev