Improve translatability of summaries.

Change-Id: I362b335cbe219d6e371a458c9d50fcd66bdf19fe
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2