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

* commit '2856d0b058d54427df8ecdc8b4bec5e9b0f7fc5c':
  Remove unused strings