Merge "Make DumpstateListener onError method oneway"