RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c
am: 37e2229257

Change-Id: I3d7696be9733e40f31c160a77505c4e96ca05b5e