Merge "Initial workaround for changed platform codename breakage" into sc-v2-dev