Merge "Fix the build fail of toolkit-test-util" into devel/master