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

Change-Id: I672d07ca2d0a251c246993ab8c7c3075de385570