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

Change-Id: Iab33d0aa67694899193fd0065c1e8e129eb3a278