Merge "Fix heap verification with SS/GSS."