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

Change-Id: I89dd5d5c980389f4b7b56b8add805e22a92ba830