Merge "Move the last user save from onCleanupUser to onStopUser" into oc-dev
am: f323e3a543

Change-Id: I77c183728a66b94a1fc3b92730596b5c4a77c5db