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

Change-Id: I075575a959222734a1774e78ae929e35bad40186