Clean unecessary branching

Bug: N/A
Test: Not needed, not changing any logic
Change-Id: I25e9883980b26b6167451ba7b5a8f9b5efc01fe1
1 file changed