Merge "sync rich comments back from google3" into nyc-mr1-dev