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

Change-Id: I68805e758105c2b4da2e484a55c607558e116e6b