Bug: 314970357 Test: m a Flag: EXEMPT, mechanical refactor Change-Id: If11081de3d22e6673b8256b26d24d0053fbcbdc6