Merge "Hide pii in CellIdentity and CellLocation" into udc-dev