Merge "Upgrade AnnotatedStackTraceElement comments."