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

Change-Id: Ib59b24a9958762fee246955c6eb7a0345e574978