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

* commit '242a880349e6ef74719a19e3310d5c5343acfef5':
  Fix for TextureViewTest