am 8943910a: Merge "fix broken ColorBufferTest" into jb-mr1-dev

* commit '8943910a8541723ff36a29a32e590a43114ab528':
  fix broken ColorBufferTest