Merge "Surface: add unit test for GetAndFlushRemovedBuffers" into oc-dev am: 52402901b3
am: 941af0bd18

Change-Id: Iadae9a5eb905b1c6ec1f0030e94732d26cb83780