am 2d13966c: am cc367043: Merge "Descriptor references are direct references"

* commit '2d13966cfe568cb428f257a6992d013cfb5353e6':
  Descriptor references are direct references