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

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