am 93c299d0: am a1e273ae: Merge "Surface: fix a protected buffer test" into ics-mr0

* commit '93c299d0d0fc46c2407edca569960c36043c137a':
  Surface: fix a protected buffer test