Condition cleanup.

Change-Id: If978bebac52c0b1438e86339669f409b4b17c6fc
9 files changed