Also address some RTL issues b/10784160 b/13544189 b/13585832 Change-Id: I5c86497940ce4b972e0ee9189418f120391a8833
Change-Id: I7f707446a963912fe5786dacb5569e68db572d1c