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

Change-Id: Ibd249f3f4d97ee143a885b89e040a4ae8cfbde1d