Merge "rootdir: add pstore"