Support PRIVATE_TO_THIS in cls stub builder
Reintroduce change erroneously reverted in 2fec18ffa7e620f386a76f7eaa2cd2589614c8f0
Buildserver auto merge