Merge "Make the time zone test1 APEX uninstallable"