Merge "Keep ScopedEndpointBufferAlloc in variables"
am: 1fba0b75b8

Change-Id: I5def988354b3e46fa5f81ff9ea6906dafcd58438