Merge "Improve NewDatabasePerformanceTests" into oc-mr1-dev am: b0a647f951
am: b1c65f2ef7  -s ours

Change-Id: I5e54314d1dd4b68f04af8b83ff777d8504445c7f