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

Change-Id: I799d11e2e29f9d90771d421e7bd8a02a90c27af1