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

Change-Id: Ie6a8b11fada01fe590fc52362e1e822e7a4807d8