am 8c7380b4: am 3802b5d4: Merge "rootdir: add pstore"

* commit '8c7380b4761d5ca02d839ccd337014116134a5b8':
  rootdir: add pstore