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

Change-Id: Icafdba7a84bc5e6746e2959811e9c70b8531481d