Merge "Follow up changes to ag/1627041." into nyc-andromeda-dev