Simplify nested logic

Flag: EXEMPT minor refactor
Test: atest TracingTests
Change-Id: I90b1002782d4a7db46bee465a3fb1e9d7914a2b6
1 file changed