Anssi's patches for libphonenumber