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

Change-Id: Ie20644fd70140817fb67eb361ee382c833728830