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

Change-Id: I8911bc5f9d665c4d168b729bc38b9a1e21237b4b