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