Merge "Address minor comments after go/ag/858723" into nyc-dev