Some initial cleanup before making changes to either class. Test: n/a, refactoring only Bug: 33124798 Change-Id: Idf0328bcc6de72b694ca7b35122ecad845cf1c4b
Some initial cleanup before making changes to either class. Test: n/a, refactoring only Bug: 33124798 Change-Id: Idf0328bcc6de72b694ca7b35122ecad845cf1c4b