Merge "More setStorageParams improvements." into rvc-dev am: 8213773bc9

Change-Id: I7168a6f5327887d5566b2d39d8b028a61be38057