Merge "Follow up changes from ag/1190582." into nyc-andromeda-dev