[automerger skipped] Merge "Clean up the arguments annotation and verify items...
[automerger skipped] Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest." into qt-dev
am: cfaa8ead -s ours
am skip reason: change_id I1db13a48b59d743482436ecf8a20d7f12edd6e1c with SHA1 a23bbba1 is in history
Change-Id: Ie908aaa904db4fd8540819b3afe2930de273e28a