Merge "Fix build break."