Merge "Remove PII from CallerInfoLookupHandle" into nyc-mr1-dev am: bab4b21e63
am: 4f5a24bc35

Change-Id: I81fe6e7e5d266a2d4ce14eeeabd3400e4650f948