Fix issues in RTL.

Fixes: 157551066
Test: manual
Change-Id: I3710b45c44b923141dff105888b3d1b01971d8e2
4 files changed