Merge "Fix VHAL Emulator Test" into oc-mr1-dev