Opportunistic sync

Change-Id: Iab2e91ccb9b4e84c180c981d565ad930737a8354