Merge "Add null check when parsing JSON for contact metadata." into nyc-dev