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

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