Merge "Update script to download a specific version of tzdata" am: b0a9661351
am: 72abd01470

Change-Id: I05c99b7ff90c9c75fe3aa68f6adc4879f978c0c0