am 08d7ee6e: am 770128da: am cee91a3b: am 3468f856: Merge "Fix for TextureViewTest" into jb-dev

* commit '08d7ee6ea15651c0f0c6aceb3d168453926329e1':
  Fix for TextureViewTest