Merge "[People Service] Catch possible `SQLiteException` when querying CP2" into tm-qpr-dev