Merge "Keep ScopedEndpointBufferAlloc in variables" am: 1fba0b75b8
am: 5ffdae08b5

Change-Id: I0d1a1105450dc54af6a1e28a4a5eff40900d02c8