Merge change 20132

* changes:
  opengl tests