b/13638835 Change-Id: I7800cf0638097ae70c0b22384e2effc09c6ab2e3
Also address some RTL issues b/10784160 b/13544189 b/13585832 Change-Id: I5c86497940ce4b972e0ee9189418f120391a8833
b/13508015 Change-Id: I9f7a09467fbee5a57985f36eaa47c2cc7b9d4086