fix compile errors

Change-Id: I8d1a07671d04559545a48494fb3a9cc99cac6271