changes to fix build

Change-Id: Ib6cdc1d85be0ab53e531c18b7ea4ecaa228b9b71