am cdc38d04: Merge "Fix the v2 descriptor handling."

* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
  Fix the v2 descriptor handling.