Bug: 391519669 Test: manual Flag: EXEMPT refactor Change-Id: I75921630b55c21d0b93dc626445f58e6bf1bd043