Modifications necessary for new build area..

Change-Id: Ic65ab916b9a6078ba2dd7826d8c2d70ed57eab6a