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