Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd' * commit '33728557540d9033ff396f7a2ddd4fb304fdedcd': Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd' * commit '33728557540d9033ff396f7a2ddd4fb304fdedcd': Fix test breakage in Zaku. Modification to PhoneNumberUtils included.