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

Change-Id: I95ffb54c7636c5ee811840c33917a8d673054a67