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

Change-Id: I260d6099961893c1b8ba338eea9cce772a7c6179