Merge "Fix and test DatabaseHelper.onUpgrade()" into oc-dev am: 120775933c
am: 90dfc95509

Change-Id: I830efd0dd3d2d4f3fc614bcf42cb89768d63237a