Rb back compat: Base changes

Bug: 263816046
Test: manual
Change-Id: Ib8c1a0576824dad4ce2b38e51affe665dbdb788e
3 files changed