Merge "Fix bad rebase in ag/3577127."