Merge "Rename IDumpstateListener errorcode" am: d7d075fbf6
am: c943242ff9

Change-Id: I2a8b3bf992243d3d5508248127e690e050f925e3