am 1d87302d: am f1e44bb9: (-s ours) am ed2fe57c: Use single tree for multiple storage views.

* commit '1d87302df6c4a13b8a35e50ebdada19e5b8ba521':