Merge "Move the IpMemoryStore to the network stack." am: 93bf5ef495
am: 5db1518bfa

Change-Id: I20e384320309579b19fe44f3841ffbc49c028c6d