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

Change-Id: Ibfa970512384cee4be8868fbfde4b5c70a38631e