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