Bug: 400335057 Flag: EXEMPT refactor Test: manual Change-Id: I6c6a053b64a0a10773bf9d51c44387a3597e91ad