Merge "More setStorageParams improvements." into rvc-dev am: 8213773b am: 978163b7 am: 563f22b9 Change-Id: I9e92866b0f80d985d9a6e04bbe7f8abff5f8bebb