am 3ce40b4c: Merge "fix flaky opengl test" into jb-dev

* commit '3ce40b4c58f6e9a1dd7d0930700cdb65519313c0':
  fix flaky opengl test