Merge "Fix issue #32180780: Sync adapters inappropriately being run..." into oc-dev
am: 0fa2574ecb

Change-Id: I7ea8132d0dcda44c25d1d96a1ce4f52f6cb0e72c