fix a few of the tags for helpouts compatibility

Change-Id: Ic7f6f281c937bcba8690a50ce1c5417689993352
4 files changed