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

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