Fix a regression in sync manager am: dfed1c73ec am: a09f3790ac
am: 511801eb0f

Change-Id: I79e04f64bbd4ee42e1cae17a43c71dff5db96586