Merge \"Improve ANR dropbox reports\" into nyc-dev
am: 594c9cb356

Change-Id: Ic3c8b1c5fc1c1b9c2c5e5d8df48d072269a92cc6