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

Change-Id: I43e70bfe2e325c534f3eaedd3043ffb92470aed9