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

Change-Id: Id2c8488a5fbc18050fb345478b76219a770eafb2