42beb544e9
This allows for better code organization based on the code logic Bug: 246382466 Test: Presubmit Change-Id: I6148143a60afdd917a11587e327f5e8a4d7def9e