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

Change-Id: I9218cc1bcd25bd00975413e1c2b6bd75ce49eb36