am 22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '22e620c4bed8c60361c02820cda4dfaafe83ebe5' into gingerbread-plus-aosp

* commit '22e620c4bed8c60361c02820cda4dfaafe83ebe5':
  a few more existing user modules to be grandfathered in - DO NOT MERGE