Merge "Keep internal stack trace methods declaring classes live"