Merge "Change the way how we call setStorageParams." into rvc-dev am: 9f16f2665a

Change-Id: I21a175fe5a65144f2b608796b2b7e9dddfd0cea0