Merge "Add more methods to dumpstate listener" am: 601fe6c886 am: 0660847908
am: 8b6a261fdb

Change-Id: I0da55ec2aac9df95f088d7e2185e14801816dc38