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

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