(TM-MP) Rb back compat: Base changes

Bug: 263816046
Test: manual
Change-Id: I282cceadded830d98fefe5f7d46e7f7ad640c4fe
6 files changed