am ca9da509: Merge "Correct another RegStorage::Solo32"

* commit 'ca9da5090a946331ca5e72a39c6f70721d3b326c':
  Correct another RegStorage::Solo32