This will avoid cases where the user is permanently stuck, if we fail to error out when a failed sync occurs or for any reason. Bug: 5032763 Change-Id: Ib82a62add767d13dc844a90e5ea4147d3ada59dd