Merge "Simplify crash dialog" into nyc-dev
am: 9764fea483

* commit '9764fea48350e9148b606f8e10686e298437e440':
  Simplify crash dialog

Change-Id: Idbe8524005b63fe008fa01dde96b9408eceaefc6