Merge "Move the IpMemoryStore to the network stack." am: 3b3aabfb68
am: e0f77826f7

Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d