Merge "Merge "(TM-MP) Rb back compat: Base changes" into tm-mainline-prod am: 15a5bdb953" into udc-dev