This cuts one more dependency on Gerrit's comment model. Change-Id: Ia0da0162f5bf97f350914cebda9be3b0a19a7680