am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb

* commit '2597aedb3869e46f945359c529e03263c77a944d':
  Turn another assertion into a runtime error. Damn you surfaces.