am ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread

* commit 'ca572fb64b77a2fe3ff93874ee5956214368b104':
  DO NOT MERGE Put additional update package names in config.xml