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

* commit '70212a404a46c6a2d4830e721156c3fafbfb1a3a':
  Gracefully handle truncated log messages.