Merge "Fix broken data retry" into honeycomb-LTE