Merge "Fix PhoneNumberTest.testGetLine1Number" into mnc-dev