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

Change-Id: I10ec83421867e27e04693f831c23f369d1cdf108