Merge changes from topic "am-230b930766e545f0940a7cadf39805ec"

* changes:
  [automerger skipped] Merge changes from topic "back111085900" into oc-dev am: f0095ec4 am: 5e8e47d4 am: 3375c14a  -s ours am: 5c16aa77  -s ours am: 6ff3b366  -s ours
  [automerger skipped] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 5a55a72f am: 628667ac am: d270842f  -s ours am: a0bda20a  -s ours am: d3a09ba0  -s ours
  [automerger skipped] [automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f am: c09bb997 am: 424304f8 am: b2e2b138 skipped: a2ad2596 am: 4ccfb1d0 am: efe1afbf am: 2adafa92  -s ours am: 205895e6  -s ours am: 7bbb5456  -s ours
  [automerger skipped] [automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am: 286fd565 am: 8ecd22c0 am: 97d0d2c2 am: ca5fd693 skipped: 19d2af61 am: f5c1a7ca am: b2ed78a1 am: 798655e2  -s ours am: b630be0b  -s ours am: 74b6d523  -s ours