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

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