Merge "Bidi wrap keyboard names before displaying them." into oc-dev
am: b8d6222e23

Change-Id: I46d9cc46789d193d13cdb64f0cccd65dbb1e727f