Merge "Remove obsolete methods from DumpstateListener implementations"