fix compile errors

Change-Id: I57994f8bdf54d63d3cf8a33a73fe771cf512e520