Bug: 381353150 Test: atest UtilsTest Flag: EXEMPT minor refactor Change-Id: Id017f2b5a0f51d19878bf91b219334baeda97d6d
ccf197b366
9b18787489