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

Change-Id: I5b0a10f07fc4c638cd1c337bb7f25d3e7f2554b9