Merge "composer3- frozen + VNDK version"