Merge "Add a manual path for setting time zone"