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

Change-Id: Ibc7c9092c4766d4dae21453a224331f1bba6d724