Merge "[Bouncer] Apply interpolation to udfps" into tm-dev