Merge "Revert "Fix N_SE-46938 for tz list."" into tizen_2.2