Merge cherrypicks of ['googleplex-android-review.googlesource.com/29661758'] into 25D4-release. Change-Id: I943c19744cd12d73e6c0d5c603cc5240127485ab