Correctly mark string as untranslatable.

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