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

Change-Id: I0aca5e71ab896b41e32aace224ed5359d5bf21fb