am 02d0829c: am 2856d0b0: am a21efb42: am 23d0af69: Merge "Remove unused strings" into klp-dev

* commit '02d0829cff4fbf838b193cc7f4b0bb48603fdbd6':
  Remove unused strings