Merge "dumpstate: explicitly specify capabilities"