am 46a41ced: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1

* commit '46a41ced325f0519e37374179623ff3079b6aed9':
  DO NOT MERGE Revert "Increase line limit for summary text"