am a40a6473: Merge "Increase time  out for CTS" into jb-dev

* commit 'a40a647371087e466a22bc9448d933daf7a674f7':
  Increase time  out for CTS