Merge "Change tzdatacheck to avoid hardcoding" am: d29ed5628c am: a7b4cc0908
am: 7d33b399c9

Change-Id: I8400547ca2ea0aefde688a47b927d32fecafcc00