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

Change-Id: Ib10790ff27f7fe0894df6172cb18444506d847f6