Merge changes I2363e66a,If17effb9

* changes:
  Enabled NetworkPolicy backup and restore.
  Enabled SoftAP Configuration Backup