Build was broken due to refactoring in master Test: build Change-Id: Ic455c504bc1dab56da3630073245b8391614f042