Merge "Fix to handle hidl_string correctly in error scenarios."