Refactor hardcoded strings to vars

Change-Id: I507ceca9fc5d819e900194d520df947b731631e6
2 files changed