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

Change-Id: I6e672e4edbd4a0e06edd1414c792186f38e4ffa3