Fix appId, clientId, appData refactoring oopsie

Test: yes
Change-Id: Ibbead8ca5b2d302395cfdc3224f7bcd477b708e7
2 files changed