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

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