[automerger skipped] Merge "Make the memory store operations serial." into...
[automerger skipped] Merge "Make the memory store operations serial." into qt-dev am: 1e5e72f2 -s ours am: 4c7a27b2 -s ours
am: 385da166 -s ours
am skip reason: change_id I10b5c5cd85fcb76924ba96c8c379be677774705d with SHA1 5d258aec is in history
Change-Id: I76725e897722d1737d7ed1693b9c732e8d19aa93