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

Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
1 file changed