am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev

* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly