Merge changes from topic "cts-networkprovider" am: 767e3a23d2

Change-Id: I3e86ba642bc86bb25dc45ef65328c014962c95db
tree: 6354b077902b2ce907cdd9fd6d596f5c1a0ae7c9
  1. core/
  2. services/
  3. tests/