am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread

* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
  Default uninstallable modules' tag to optional