Newer gcc's output logical-op warnings when and'ing together
a duplicate condition. In this case it's because a constant
was set to an enum value that was also checked locally.

Change-Id: Iada9571d3e59ec9b75aa446fd6690587092af161