FIxes for building.

Change-Id: Ib3b737bfbfd15c826d5898394a51ceb57f183d94