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

Change-Id: I8f60657c4b670bd473696a67c7d6311791030572