Merge "Fix build lint issue."