Merge changes from topic 'netd_aosp'
am: d19524f4f2

Change-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70