Remove duplicated condition

Change-Id: Ib2d3d69180de6e663f36f4d9445d69ea7b42e85a
Merge "Remove duplicated condition"