Build config change

Change-Id: I51c32a92a2865264ce88aeff000bf5b781b051f1