Merge "Hide CMP API until ready for release." into sc-mainline-prod