Merge cherrypicks of ['googleplex-android-review.googlesource.com/21353691'] into tm-d2-release. Change-Id: Ia1676d6f93127a359c4b31093cbf880a6279444e