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

* commit '47ec443ae0cab1de6f1e2504974cc42e019ce556':