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

Change-Id: Ie17d471010d28879683c2643eaf938bff1cf53be