Fixes for DSB-We are Building.

Change-Id: I6aa01f13f4a8dcb443698ceb7ad0e7cd9f06445d