am cc367043: Merge "Descriptor references are direct references"

* commit 'cc367043000190bff471c5a7a0a9e61b0212a1c9':
  Descriptor references are direct references