Merge "SyncManager: detect suspicious periodic sync removal." into oc-mr1-dev
am: 5d9ec3f840

Change-Id: I7fc888ac5d35a721716f0325793c4c2557a36041