Merge "Force save profiles for SIGUSR1" am: 7a5eccf39d am: 866269321a am: 3b3d551ca4
am: 6af6290638

Change-Id: I3c7297529ef3e9c134e2c14c7522638abc3d4fb5