Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev am: 79fb65bb7b
am: 514e9c074e

Change-Id: I3c3246697ec248d08b57beb82b0c9dc97a2b77b1