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

Change-Id: I921a224a8b138cb982587f44f4c647b49108e2ab