am e55b0e2e: Fix issue #2895310: Please fix problems with your strings

Merge commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f' into gingerbread-plus-aosp

* commit 'e55b0e2e88adc2be5958d0ae4ea310997aa2002f':
  Fix issue #2895310: Please fix problems with your strings