Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev