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

Change-Id: I6aed3e0f92d92897239776b568b8074366c2ed3c
tree: aff498463337dbe9390c6c945755211cedd96b13
  1. core/
  2. services/
  3. tests/