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

* commit '94c325e4795ad78492372352036208cb1cec2dd1':
  Remove unused strings