Add a few more legacy modules that can have user tags - do not merge

Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
1 file changed