Merge change Ic2a16d4f into eclair

* changes:
  b/2148252 Fix emulator