am b18bcf13: am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"

* commit 'b18bcf13fd47102a2527e599cde0b1d59ab7c51e':
  Fix Issue #35489: drm content corruption on GB