Merge "Allow dumpstate to read some directories." am: edbe51215e am: f2cfe86a82
am: 953b006e3b

Change-Id: I3a6d1719ef3738eb1c5016ee2e2634b3574f4e6d