sync rich comments back from google3

Bug: 30116535
Change-Id: I6e43ffda3d15b331c18752b5ee15770c6cdbfe85
1 file changed