Merge cherrypicks of ['googleplex-android-review.googlesource.com/23628801'] into tm-qpr3-release. Change-Id: Ic16fe338c7561df74aebad1546e2af4eab8bc704