Changed some parts of the code to prepare it for script support that will come in later commit.

Bug: 2903591

Change-Id: If8fcfad1557c8140c476212d8be9f99987cdaa18
3 files changed