am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"

* commit '4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc':
  Add a few more legacy modules that can have user tags - do not merge