Merge "dumpstate mk -> bp" am: b1088c6de1
am: 9251e71740

Change-Id: I4cdfb67a299ca6ab601306e1ef83d099eabbd8f8