made code preparations for build

Change-Id: Icea9a62a8514c14aa7b9e111ff2320d9335bb485