am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev

* commit 'ddf5a170d592614cbc2b7c1d88d906b7683e51d1':
  Relax user constraint on storage state.