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

Change-Id: I067c42ea4ec354713ad546c4673fd8e275aa3feb