Build fixes

Change-Id: I5245b2317a3f2f3d4df73df60200e9b2dc7f5410