Bug: 372732219 Test: atest Flag: EXEMPT refactor Change-Id: I8fc419acd0311cc5b11d78662fb6a13b2c61b169