Merge cherrypicks of [20231047] into tm-qpr1-release.

Change-Id: I06200b6d2ae3eba5ed331c98bffa74ab785ad9f1