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

Change-Id: Ibba54026a3218d10e9b4a200c94b5bcd5a488e22