RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 0e66ea6f32 am: 71765a75d1
am: 404ea77826

Change-Id: I12deb9d1415c14ed2995e6a7d0912126ac993750