Merge "Revert "sync: remove legacy sync info API""
am: c2a89f396b

Change-Id: I22b25b4fb2843839285316f0aa4631c7046c94e1