am ed65508a: am b3cd9e86: am b7db4ed0: am 9f987e0a: fix a few of the tags for helpouts compatibility

* commit 'ed65508a94484c0b3ea750e18a9a6970daa9acb1':
  fix a few of the tags for helpouts compatibility