Merge "Fix VHAL Emulator Test" into oc-mr1-dev
am: 22a9fa7c76

Change-Id: If310615d22816b832660e0308aed85979f073197