a few more grandfathered user tags - DO NOT MERGE

Change-Id: Ia625817d3f332f8760835b3fa20e56c00c305166
1 file changed