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

Change-Id: I72d067bc5225641a3d1a6aa83f678bbad11f944c