Apply Tilapia/Grouper BT fix to Manta?

Change-Id: I86849d0008b32b574bb842c255d72af9ca000790