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

Change-Id: Ia2202686d5a8039bc98336f99e219248ac2bc2b8