Merge "fix build for ag/887244" into nyc-dev