Handle OutOfSync by resyncing automatically (#10780)

Change-Id: I5958d82b09519dabe9f2af792bd216d3b426c1c9
Merge "Handle OutOfSync by resyncing automatically (#10780)" into 7.0