Code streamlining

Test: existing
Bug: 74062470
Change-Id: Ib731b798d7de916a3acdbec860bdd2f58729c466
(cherry picked from commit 380de2eb6a860340d194a1b8e79ce0b3eea3a04f)
1 file changed