Merge "Move tzdatacheck execution after apex is mounted"