Merge "Fix VHAL Emulator Test" into oc-mr1-dev am: 22a9fa7c76 am: 6d59d8c7a3
am: 7758a1c86c

Change-Id: I5ba742be71f2a4fc597d1822a8e868765fe3fb3e