Merge "Fix hidl return checks"