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

Change-Id: If1a079088f232304568bd5de81987df86d3b465c