[automerger skipped] Merge "adopt non-blocking method to obtain the...
[automerger skipped] Merge "adopt non-blocking method to obtain the IpMemoryStore service." into qt-dev am: 29510ea4 -s ours
am: 215cc091 -s ours
am skip reason: change_id I7de4f23370bdf9c9df5e74ed074c794080d93d95 with SHA1 a489a8d4 is in history
Change-Id: I0c382d8b7909ac2bac194071693132ab558f5051