Merge "Close databases in onStop user" into oc-dev
am: cc416b6c2e

Change-Id: Iec06c6a467ea9c3801afed8f9f043b9e1b8bbda6