Merge "Emulator: update development to 2362bfb6" into oc-dev am: 3a14fee0ac am: 0fc588fb5f
am: 5ea5b8eb3e

Change-Id: If9a1ec85318d22cd4231b4fa3f0d8e6a5baf7c58