Merge "Add TransactionProfiler::redefineExpectations and migrate appropriate callers"