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

Change-Id: I0df7c551441fea3dfe4c00fd69ba2942b520dd7e