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

Change-Id: Ib8b0773a2abed59a7464a1eab034db394b9b2c53