Merge "Fix security vulnerability in libphonenumber"