Merge "Fix the ui test data flow."