Merge "Strict SQLiteQueryBuilder needs to be stricter."