Merge "Call new dumpstate listener methods" am: f9b848a8a9 am: 3d425cbc4c
am: df236808f7

Change-Id: Ie996da684a39a59d50f3dfacb873c62c663eed05