Merge "Fix failure to check HIDL return status" into oc-mr1-dev