Merge "Fix tests broken in ag/3574286"