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

* commit 'f36611dc2f728cbefe2ab87ce87d5110ec256c97':
  Be very patient with the emulator.