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

Change-Id: I84b14c4fdd8b6fdf8b3164aefb2af319e7bf3b85