Fix iso build

Change-Id: I7e6375fbb7948c459013f2aa30d50a66e90b2b4f