Merge "Increment apex version" into sc-mainline-prod