Merge "Remap call diagnostic service constants to internal D2D constants" into sc-dev