Fix build errors

Change-Id: I50ac20355c92810dd37e593ea6938c6951b04c92