Merge "Tether Offload HAL" am: e9b4ab6723
am: cd60c276d1

Change-Id: I709458a5e29a3b058acd6b7f8b5d26f509748659