Merge "Address comments in ag/1514806." into nyc-andromeda-dev