fix build errors

Change-Id: I5030fdceb9b5717e701467d446983deda16022a6