Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"