ShortcutAddAndRemove TB2 -> TB4

Change-Id: If899309eb1b05f4a519eed45df4e9cf1670a7740