made code preparations for build

Change-Id: Ia65ca7c331fb11ac890afd442b9322a6cf99d79c