Combining if-else branches from different conditions.

Change-Id: Ie51cf58de4f872d2261022558b6afe780bbc470b
1 file changed