Merge changes from topic "cts-networkprovider" am: 334a3ef5 am: 8720021d am: d7fbae3e am: f3187062 Change-Id: I54b4052e079cef6f13a6e29cf66ddfb26c27d3d4