Removing : warning: ambiguous first argument;
Merge pull request #8975 from arunagw/warning_removed_ambiguous_first_argument

Removing : warning: ambiguous first argument;
Remove useless || operation