Merge "hidl_string: empty string opt always applies"