Merge "Remove unnecessary local variable declaration"