am 61a8f0bb: Merge "Fix the Chrome app crash in emulator issue"

* commit '61a8f0bbc146a4050a885e1e7c314dfc4ab72779':
  Fix the Chrome app crash in emulator issue