Merge cherrypicks of ['googleplex-android-review.googlesource.com/20907887'] into tm-d4-release.

Change-Id: Icf41e56cb2c201f5030ac8d2a3f2a099ca4288d9