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

Change-Id: Ifbd359f9fec530076f3216c171120436ed4221a6