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

Change-Id: I3f2c65510c45482195843f211f1f39186f9729fd