Merge "Fix end-to-end value metrics tests."