Merge "Preserve leading "+" in phone numbers" into lmp-mr1-dev