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

Change-Id: I83c7df7624653bc16def7ed8d8806e50506faede