Bug: 361850561 Test: Presumit Flag: EXEMPT refactor Change-Id: I2d2e556fc1c81eaac74e2a1a2a1c5526505f7a56