Merge "Move tzdatacheck execution after apex is mounted" am: 61b2016881
am: 3305192d3a

Change-Id: Ibd10e2778c66dd7a4ff3d1139f5a783405d73941