Merge "Fix the hash for I18nPhoneNumberWrapper" into pi-car-dev am: da0866a534
am: 8d79c640fd

Change-Id: I29e8dda24bd499f85f33084912778b3bbc4caada