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

Change-Id: I9cb450ebc75cf6784bb6a471b5fd53a6620719b3