Mechanical merge of nested if statements.

This is just a mechanical merge of nested if statements with a dead code
removal.  Nothing is changed logically.

Bug: 22285167
Change-Id: I28c1de84635b68108b25ec32ec58de2128758512
1 file changed