Bug: 386288280 Test: Presubmit Flag: EXEMPT refactor Change-Id: Ie1ceb513205028e12acefc6bcf8dbf628ce15bc4