fix compile errors

Change-Id: Ic8335404ccbd40961b63d814d8706b6cdf5efa42