Merge "Update dumpstate binary file name" into oc-dr1-dev am: 8d897e6003
am: 990dc8c59c

Change-Id: Iadce5459a5edf5187134e2c246d7bbe00f735629