Merge "Merge "Fix a regression in sync manager" into nyc-mr1-dev am:...
Merge "Merge "Fix a regression in sync manager" into nyc-mr1-dev am: 6f1955bf am: 166d67b7" into nyc-mr1-dev-plus-aosp
am: cc828829
Change-Id: Ib8733a28b5b63a66ec953aa7556ccff3912079d5