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

Change-Id: Ic7760c949c72c439545d910f30cff3f664767b87