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

Change-Id: I6ccdc801e3888a61b22272c8ce9480f45fa26df2