Merge "Remove spurious syncmanager wake-ups" into mnc-dev