Merge "dumpstate mk -> bp"
am: b1088c6de1

Change-Id: I87ce7729e0a8775f7859eab6de48803209aa5941