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

Change-Id: I909949ea597936f4ca6e391c6f04cbf2be0c1a69