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