Revert incorrect TM Branching Stage 4 merges

Bug: 230125562

This reverts commit 55e05cc9cfb3716f23e60a6c5f57926490d58762, reversing
changes made to 49bafda5795c82232c82ff9506acb4bc2b96cbc7.

This reverts commit 49bafda5795c82232c82ff9506acb4bc2b96cbc7, reversing
changes made to 94f82ab5ed52116a41e6e927975192701f3c40b9.

This reverts commit 94f82ab5ed52116a41e6e927975192701f3c40b9, reversing
changes made to b63c6357785cf7fa181a24823264b877e784e6d4.

Change-Id: I5269bc685af079ea3b2dbc33c598de85b070753e
48 files changed