Bug: 336612373 Test: manual Flag: EXEMPT refactor Change-Id: I916341973c4279e548af59452842bc0a677ef6b0