Merge "Fix robo test build error"