Merge changes from topic 'netd_aosp' am: d19524f4f2
am: 853427a30a

Change-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77