am a64f5f61: Merge change 1124 into donut

Merge commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb'

* commit 'a64f5f61677cf4aa3bf871c87be950bb85c2aeeb':
  Fix SQLite limit issue.