Merge "Remove some usages of NitzData.isDst()"