a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
1 file changed