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

Change-Id: I839e0dc31bfee04deb2dd87cf847f7f7c9d39254