Merge "Remove time_zones_by_country.xml file" am: 3436fd4833
am: 1541ef3712

Change-Id: Iba095c44c332658f7eea448dcf653b46bce5d8e8