Potential fix for sync failure.

Change-Id: I5527a969fb5beece75bcbc1ee2544e253201b90f