Bug: 388199937 Test: manual Flag: EXEMPT refactor Change-Id: I66a1cec4483818a81f754c3aaa47cc569503f2fa