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

Change-Id: I4a1db34b59519dd29c3df477ca99acacd6db225a