[Bug 793785][Bug 881185] Fix RTL Issues.