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