Merge "Zero length in keymaster_free_param_set." into nyc-dev