am e5c4d0a7: am f424208a: Merge "Increase Holo long timeout to 6 seconds" into jb-dev

* commit 'e5c4d0a70f08d81d1a7020656594b1a9ca202f31':
  Increase Holo long timeout to 6 seconds