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

Change-Id: I6b9a7de9e2f495fe98ce8d4b8ba62ab56f457855