am ab17f6c1: (-s ours) 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 'ab17f6c1e69212e609f9d180361245d8c37108ff':
  Add a few more legacy modules that can have user tags - do not merge