Remove unnecessarily nested else-clauses

Change-Id: I3249ed3ef829475db7a823d961580f06e459cd25
2 files changed