Merge "Followups to ag/1553792/" into nyc-andromeda-dev