Merge "Dump profile logs after the last save" am: 25732aec3d
am: 033225edc8

Change-Id: I7d68ef559d8a835e4f9d0ff1093ff104d30df300