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

Change-Id: I6c938e3c64e7b584dd5f4262646daa3677551f91