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

Change-Id: Ib422f111125959f0044f35bab73728233c31b558