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

Change-Id: I9a3e72188bcd9f88ffcf08d1b7495264fb03c3ea