Merge "Make the memory store operations serial." am: 1f397201e3 am: dbca5369f5
am: c8697f7246

Change-Id: I4b286c2c185498f444dfd0fd1afc45766e5c27a5