Merge "Fix test build failure"