Merge "Make 946 print stacktrace to System.out"