Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev
am: 7633a081ab

Change-Id: Ia3853da8933c8c21fe06acad79059a3589eeb835