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

Change-Id: I9e87b54d39869d6c1f8f21f3e1bb22c268cd380a