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

Change-Id: Ib84a34fa251a6118cf4c642e9fa4c2e8a6caa61c