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

Change-Id: Ifb689e862e419c77b9712ee8211bf1dc6a664c2f