Merge changes Id020e16f,Icb2d027e into rvc-dev

* changes:
  Fix removing enterprise suggestion certificate
  Fix WifiKeyStore remove CA certificate.
tree: e49549bcbf7d899e5f201435ce40ad407bdd3883
  1. apex/
  2. service/
  3. PREUPLOAD.cfg