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

Change-Id: I1e0eedc7d3d06d3988681fbe64c54a275e103a54