Merge cherrypicks of ['googleplex-android-review.googlesource.com/39865694'] into 26Q2-release.

Change-Id: If04407f2843598bd7e13e442ceddc644010ac862