Merge "RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options." into oc-dev