am 0391820c: am 0de2351e: Merge "Don\'t remove existing explicitly stashed blocks"

* commit '0391820cde1f27515e9fc8f556b72c3922af9d45':
  Don't remove existing explicitly stashed blocks