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

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