Merge "Remove unnecessary int declaration"