PT-44887707 - fix dart build issues
Merge branch 'dart' into release-4.6-unstable-18