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

Change-Id: I11d97e655f9929afe789267cf8e46e2937e43576