am 1b3c4299: am 70212a40: Merge "Gracefully handle truncated log messages." into ics-mr1

* commit '1b3c42992abbd97afb51af4bd8754646b8ebf689':
  Gracefully handle truncated log messages.