Merge "Make Ethernet more robust. am: 9effed6f9e am: 00f803738d" into oc-dr1-dev-plus-aosp
am: c9eddcde9c

Change-Id: I5e05dd306ae651aa75735d887c2a74e5f2fe4f6d