Bug: 404705846 Test: presubmit Flag: EXEMPT refactor Change-Id: Ic384e82be26fe97270af04b76d83ba2f7814b7df