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