Revert \\"Update timezone data to 2016b\\" am: 5ed031daa3  -s ours
am: 371b718a0b

Change-Id: I1bcca4982750ac839c3e69866245aea58c824827