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

Change-Id: I568895d2861c873a304bb7508e7766aba42402e2