Remove redundant check. PR#3174 (Imported from upstream's ec77f276e14f4b835cdd42fa175d74dcda532663) Change-Id: I7e33d67c201bdd088520d060cc8e4e9713223e69