[GIT PULL] pstore fixes for v5.2-rc4