fix build errors in master

Change-Id: I4f61272d5b971e36b8e5d94b513e252aeeb8942b