Merge changes from topic 'netd_aosp' am: d19524f4f2 am: 853427a30a am: 57ee5d7e9c
am: 6f605a4e0f

Change-Id: I8013cd6a7abe6f1c40c183c3857972dec0679b63