Merge "Update dumpstate binary file name" into oc-dr1-dev