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

Change-Id: I2c7ff4a9de8a0640f2a4b8077fe60875d3d0c2b4