Merge "Use getProfileKeyInternal() for S on R." into sc-dev