Merge "rootdir: access to pstore denied to bootstat" am: 8b80960417
am: fbe32e723b

Change-Id: I1011c15b922947d57c65cef9a685ed61e7be7fdd