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

Change-Id: Ibda60a3cc1e9d747b3be5ccfc3c6b08e6eafa83e