Merge "dumpstate: add interface into rc file" into pi-dev