Merge "Fix some issues for deoptimizing runtime methods."