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
Change-Id: I7b2b4984e4c1966b88f1a96af0acfc8342bb95a7