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

Change-Id: I8bc36d2c12c427e14df46f8a6bec76fa4f99cae6