Fix build errors

Change-Id: Idbf585c237058e7e1a3095b201cfe56270c9c1be