am 9e608c12: Merge "Fix issue #6381224: Initial emulator boot fails and shows a blank black screen." into jb-dev

* commit '9e608c12186d308fb1711e8824901fdf931a3a96':
  Fix issue #6381224: Initial emulator boot fails and shows a blank black screen.