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

Change-Id: I5799014cfb2d76f667a4e0ecdc6052815eb9b9ee