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

Change-Id: I7d8139a98913ae17491f73314bd426287374c270