Merge "Reimplement the PhoneNumberFormattingTextWatcher"