Merge "adopt non-blocking method to obtain the IpMemoryStore service."
am: b340a6988b

Change-Id: Idd6110141795f86dcf28eafab87683eda4c70b93