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

Change-Id: I4f38e704b362fb42c9a8704dee8b1b963008e55e