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

Change-Id: I444faff9c0f779f4c4e99949efb393d0cad66913