Merge "Make 946 print stacktrace to System.out"
am: a2eae23e57

Change-Id: Ic4605b512c0f2446eef9414b8334f137eb55a824