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

Change-Id: Iee6d73c93cf23fd0b1be8bf2743db75a383100df