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

Change-Id: I84f6e2c93ad36b2d21a22d63ce6198c00040c4af