Merge "Surface: fix a protected buffer test" into ics-mr0