Third final fix for bndtools-imposed start structureChange-Id: I0000000000000000000000000000000000000000