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

Change-Id: I33481d5a695334cb5fa99e693d812bf7791ec6b4