Merge "Update time_zones_by_country.xml / delete unused files" am: 143d13ce59 am: 23ff65ed1e
am: e9c1678643

Change-Id: Ibe2d84180b0d94f3981c7733a17379667c36b73f