Merge "[Call Timing] Add constants for call timing extras" into nyc-dev