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

Change-Id: I1b00a3fc6229c0f5e086522a435e3f728eb45f29