Merge "CallRedirectionService API review"