Merge "Revert setting GO idle time out" into jb-mr1-dev