made code preparations for build

Change-Id: I2df4c0e0361e17fa33eca405a165bd1dffa7f4ed