Merge "Call new dumpstate listener methods"
am: f9b848a8a9

Change-Id: I4851b7dbaa5b2ed9daed23a908ec5c56cfbeea1a