Merge "Force save profiles for SIGUSR1" into oc-dev am: 9638f503cd
am: 2288d93647

Change-Id: I92df7b809740fc77e604e16a5ba411381a134a29