Merge change 24213 into eclair

* changes:
  Fix a bug that prevented the "generic" product builds from working in the emulator.