Merge "Fix metrics test flakiness" into tm-dev