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

Change-Id: I6200be93065552e0cbb637f6a6f3e58a3a53e33d