Merge "Fix off-by-one in PhoneNumberUtilsTest" into mnc-dev