am 407ce3e7: Merge "Remove flaky GestureDetectorTest" into jb-dev

* commit '407ce3e7ec331b0f6c43079f71d44eacedbde769':
  Remove flaky GestureDetectorTest