am ffb49774: Improve ANR diagnostics.

* commit 'ffb497743831ae4857b674629b58ea3c46d01431':
  Improve ANR diagnostics.