Fix build errors

Change-Id: I8c02a3d85cc5477d57e88a335edf3b5b53bbfdd9