Merge "Merge "Revert "Change Ethernet API to use OutcomeReceiver"" am: 8efc170b am: 96884656 am: 1ca48e50" into tm-dev