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

Change-Id: Icfa4bdddd443585fa181336f21f7bbfb17b3e03e