Merge "Fix build breakage with ag/2997247"