Merge "Make sure classes with different access checks are not GVN-ed"