Project config changes

Change-Id: Ia5d7f586ee50a24b662be71ed20da5f2515bba7a