Merge "Remove PII from CallerInfoLookupHandle" into nyc-mr1-dev