am 6fdc805d: Merge "Be very patient with the emulator."

* commit '6fdc805d6a798c5c31294592efbe7c74c6a64b33':
  Be very patient with the emulator.