Bug: 368359967 Flag: EXEMPT refactor Test: atest Change-Id: I41d465f67fb50e83d9bd23af54597afb6bd467cf