Merge "Gracefully handle truncated log messages." into ics-mr1