Merge "Revert "Revert "Fix build after ag/2001747 breakage."""