Merge cherrypicks of ['googleplex-android-review.googlesource.com/38031568'] into 25Q2-release. Change-Id: I0f671971a43cff6b094f8f5bfc7c7cdc35bc13c7