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