Tidy conditional check
Tidy conditional check


Former-commit-id: 95fe9a9212cce8234596e14b1714a509fd55554c [formerly 748031c9dd6fdc43c848dd721269f22c64b6a94d] [formerly 997febdd1468b6c630d811cc28ece3dd7d969306 [formerly 2279147d0b5126937376614065b33411b06a4bad]]
Former-commit-id: cb7443877dfb835b8197a615e92a9e2b3dd4a343 [formerly ad53b9f1a6f5c9ed79c552e1f82dbe7fa1a49d23]
Former-commit-id: b5f6e1bb57d366b04bb697e89401562850253b0c
jason-neal/eniric,jason-neal/eniric