Merge "Remove unused import" into stable-2.6