Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." am: 2df17040 am: c14d65cc am: a23bbba1 Change-Id: I8ce3bed435fbbb814d71fe48ffd305ff3f947f3f