Merge "Fix build due to transition test errors"