This follow-up change performs some cleanup changes without affecting functionality Bug: 72950854 Test: Compiles, CTS tests using this pass Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236 Merged-In: Ic7394f24f11d713c9374b438182e29d2a02ea236 (cherry picked from commit 7df36ed96a807f258aef43e558ef127b27b90756)