Merge "Merging error-resilient example into simple_encoder."