Bug: 385136165 Test: TreeHugger Flag: EXEMPT refactoring Change-Id: I430d7086afa256d899d2201cc568f361d2177c15