Merge changes I29af4252,I9ba77156

* changes:
  Default existing WifiConfiguration's mac setting to trusted
  Persist macRandomizationSetting across reboot