[automerger skipped] Merge changes from topic "networkprovider" am: 78ff9fe27a am: 5eed2ca1ea am: f1f6f5d827 -s ours
am skip reason: Change-Id I37449efb50287c683312f0b19909bd4c61b38585 with SHA-1 9ded26e241 is in history

Change-Id: I1db428ffa82f2b29b295ea0e4b9cc58306612447