Merge "Improve string comment" into nyc-mr1-dev