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

Change-Id: I9e16111d3606614c517877c615199bd7a2f119c3