Merge "Resolve error-prone warnings."