Merge "Rb back compat: Base changes" into tm-mainline-prod