Merge "Zero length in keymaster_free_param_set." into nyc-dev am: 45e2e5f
am: 30a8671

* commit '30a86713a95e805b10937ba62acc5c0d33bac005':
  Zero length in keymaster_free_param_set.