Merge "Refactor LegacyTransactionConntextImpl"