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

Change-Id: I33ee618b57888960c7a24bde307a40032333b807