Merge "Rename WriteBufferQueueGetExternalSurface: Step 1" into oc-mr1-dev