Merge changes I33f0b3a0,I772b7981

* changes:
  Make dumpstate listener callbacks synchronous
  dumpstate: enforce oneshot