Merge "dumpstate: Log logical partition metadata in bugreports" am: 45f75b719d
am: ed8a1acbc1

Change-Id: Ia6a99e8402a486964cb4480ccfa38a015cd04b44