Merge "Address review comments on ag/962875." into nyc-dev