Merge "Dumpstate: Refactor DumpHals" am: b0f2b48c0a am: 432ff435a0
am: bea86c66cf

Change-Id: I105a1a783d9fc8ab5a7a79df836942ee300f07f5