Merge cherrypicks of ['googleplex-android-review.googlesource.com/21351396'] into tm-qpr2-release. Change-Id: I808383f5450b449143ca1dc1c8dc9f89b128a602