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

Change-Id: Ic185accac95ae48dd5f1a1e184b438db9920550a