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

Change-Id: I3ecce63f2e5bfe0cea5db8cf30842f7caac0b073