fix build errors

Change-Id: I6ca3272e9ab92c08be29d62cc63edf4620af2405