Merge changes I5ed1bc8b,Ie9e6af0e into sc-dev

* changes:
  Fix IpConfigStore dependencies on framework-connectivity
  Migrate hidden API in IpConfigStore to formal API