Merge "Fix build error."