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

Change-Id: I474e5b59d7e3cb8c370211298c0ba07760f963fb