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

Change-Id: Ie5f152c880ec5ca520743002d7ff23d556468c6d