fix compile errors

Change-Id: Ifd77d4ef68e9aa236ff3ad3ba32a8e6d80b8a826