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

Change-Id: I8c5457e3b5f4ccf48a3d71fc62f9b6d2618becff