Merge "Fence: use modern sync info API"
am: 2e41461725

Change-Id: I7fe77bc9df57a66690329bf868dafbf59412460f