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

* commit '2d0353d1092cdc2a1f175ba66b6097fca9c690b3':
  Remove unused strings