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