Non-functionally refactor scanning logic

This change is in preparation of routing logic revamp.

Test: Presubmit.
Bug: 281072508
Change-Id: Ia0ab973a2e0701a0bbc80db8ea18204300fc2b06
1 file changed