Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." am: 2df17040e5
am: c14d65cc68

Change-Id: I1db13a48b59d743482436ecf8a20d7f12edd6e1c