Merge "Making DataStoreFactory and Google API scopes variables global"
am: 92db821190

Change-Id: I55bd4413896a585966c341864c758c104235e3e9