Merge "SharedMemory: break Cleaner reference cycle."
am: 5783a79cfc

Change-Id: I732fac88ccee02e49506dd40a7204e5210648b10