Merge "Don't fail if there are no comments." am: daabcae955 am: 57a4bae7c3
am: c73d03a53a

Change-Id: Icff55d494db44e022df7f415fe19cdb685d830d1