Merge "Fix unused but set variable related compile warnings."