Merge "RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter." into oc-dev am: 7633a081 am: b0054f05 Change-Id: I491c415de567d0375296f293fcbb35ee21413ce6