Fix build errors

Change-Id: I7074eea6bc040e381e8f108beaa02befd27fa1c0