Please @Deprecate this and all other API with higher than package protected access. I assume this patch will be backported and that can't be done if there is any non-deprecated visible API change.

If for AS8 we decide that we'll commit to stick to this we can remove the deprecation in a later commit.