Merge "Limit number of in-memory db connections to 1 per pool" into oc-mr1-dev am: 0ee7495b54
am: 46ff95ddd6

Change-Id: Ibfd6c571a6db2dfffb55f492a62d9993e7cd0ad5