Merge "Merge "Better test for setStorageParams." into rvc-dev am: fdcbfb8c...
Merge "Merge "Better test for setStorageParams." into rvc-dev am: fdcbfb8c am: afc0a2e7" into rvc-d1-dev-plus-aosp am: 3edcfe17 am: 94f81747
Change-Id: I3e063e2615ae80db1f48771748409003a15a49ca