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

Change-Id: I7bc12f6c62cda8b5000682beb0d5cf0af0bbb771