Remove unnecessarily nested else-clauses

Change-Id: I23f9146d4c212f20b983bc41bd44753d989feb55
6 files changed