made code preparations for build

Change-Id: I2e1badf64b76ff34ff02ababe95c44b2c1d7be9a