Fix tethering... Inherit this from tuna overlay

Change-Id: I5ea96abe5ccd51d43272f5dbf0a6483529b29659