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