Merge "Move the IpMemoryStore to the network stack." am: edb899fcf8
am: 61e928c7cd

Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d