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

Change-Id: I898f3d7363946d9fdda92afac5babf43b5ef2dc1