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

Change-Id: Id8921abfd0193da477770c00d07713474d626ac7