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

Change-Id: I1f505667ba9eb008c0ec921ed22aa73c96cb924d