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

Change-Id: I101829c5e6f45da7684a4cfed50d3dc092348ba2