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

Change-Id: Ib06362ba5399ca1eeac804b6e6229b4d1a7fd012