Merge "Use selfIdentityUris from IMS if line1Number is not available." into nyc-mr1-dev