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