Merge "Frameworks: Fix scoping problem in SQLite"