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

* commit '770128da9c5510caa0a00e1319acd30fbc94a59c':
  Fix for TextureViewTest