Revert unwanted config changes and add project_id

Change-Id: I50e6c47080859b310de90c992fadfe247fbeadee