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

Change-Id: I27770d4e32736280f18494b540caa29c468917a0