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

Change-Id: I8d03ce9616c702d73fb6a807d45c58afd332b50b