Merge "DO NOT MERGE: Add safety net to prevent sync stoppage" into honeycomb-mr2