Merge "Cherrypick needed for merge conflict with ag/18875278" into tm-qpr-dev