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