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

Change-Id: Ia65f290dc131ba7cf86202b33aade799ac22cc5f