[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 skip reason: change_id I10b5c5cd85fcb76924ba96c8c379be677774705d with SHA1 5d258aec is in history
Change-Id: If65e2f280bb9536a1b3c248f6945eac54819d47f