Merge "Merge "Change the way how we call setStorageParams." into rvc-dev am:...
Merge "Merge "Change the way how we call setStorageParams." into rvc-dev am: 9f16f266 am: 14e544cd" into rvc-d1-dev-plus-aosp am: a477eaf6 am: 34d4599d
Change-Id: I29cfc77e86db62ee451809eecd6d619245a8b7ba