Merge "Force save profiles for SIGUSR1" am: 7a5eccf39d
am: 866269321a

Change-Id: I1c776b5c0807dce44b0db35d0d3ee908a24fa80c