Merge "Support for enhanced call/connection extras." into nyc-dev
am: d9d8fb6

* commit 'd9d8fb6508b58b55d480b1206d2e9e98a83ee019':
  Support for enhanced call/connection extras.