Merge \\"sync rich comments back from google3\\" into nyc-mr1-dev am: ad2bf54fda
am: 472eaa4b9d

Change-Id: Iaffdcdc0cf87ab60a9d61b9d02abdea779053824