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