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

Change-Id: I34ee9f11310e50e6beb936a83a778c7c5b73c542