am 1222c894: am ffb49774: Improve ANR diagnostics.

* commit '1222c8944aaa729a54b61496ac125747a31cf5f5':