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

Change-Id: I6a2337bb557735276c93c306caac43a59abff47c
1 file changed