Merge changes from topic "networkprovider" am: 78ff9fe27a am: 5eed2ca1ea

Change-Id: Ib256b5b4a710f4f28f214d614cc2c03014459a55