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