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

Change-Id: Iab9177249082bb63dee921b0435143d01bac4a25