Merge "Better test for setStorageParams." into rvc-dev am: fdcbfb8c77

Change-Id: Ib371af23686bfe5dd95a83a2397f00e99eab1373