Merge changes Ibdf23227,I3681f98c

* changes:
  Update Wifi to use new keystore function
  Add signing to keystore