Merge changes from topic "networkprovider"
am: 78ff9fe27a

Change-Id: I2caed5dd18f8a7d1bf3d9aad2ac4cac59b31e8be