Merge "Change tzdatacheck to avoid hardcoding"
am: d29ed5628c

Change-Id: I2924a187debcb1dbfeca3ec6caba9dad665680ad