Merge "sync: remove legacy sync info API"
am: 43c4bbd965

Change-Id: If3587cfb71a8c98b741f726668536614d2d07c96