Merge "Fix compile warning."