Bug: 388167106 Flag: EXEMPT refactor Test: atest Change-Id: I6491f076c22e5cca4981d4a9270f92cd53173f74
ccf197b366
9b18787489