00614eae0e
Test: Existing tests pass Bug: 349544589 Flag: EXEMPT minor refactoring Change-Id: Idf572d48d35b8eeedd7fd1b8c608834d27a818e7