Merge "Fix sqlite time measurement." into nyc-dev