Merge "Fix NPE due to uncomputed formatted phone numbers" into jb-mr1-dev