Merge "Improve debugging output for a crash."
am: 0c742e4a5c

Change-Id: Ie9114fca439d0dc5734635acc3aa77e83067e550