Merge "Update string to keep On-screen keyboard naming consistent" into rvc-dev am: d02752c847
am: 05a65ec191
am: 41c3348ef3
am: 91ecb8e00d
Change-Id: Icc57150a350f3c4b083bde69f81de498b92beb0c
This commit is contained in: