This condition looks unneeded

Change-Id: I205ec31c03953f638742091fd2fe95cdd05a5b75
Merge "This condition looks unneeded"