Merge "Fix build error"