Collapse "if" statements to reduce method complexity

Sonarqube reports methods with multiple break or continue statements as
"too complex".

Change-Id: Id43911365f28a05acbafaa72ea49ce96c9220fe0
1 file changed