am f678dbe9: am 002a502c: Merge "Update keyboard settings wording" into jb-mr1-dev

* commit 'f678dbe9c86a2a31d19b1e21526a4139360544f2':
  Update keyboard settings wording