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

Change-Id: If5f17d339935f0ebeeb97b3ec3ea123652ac113a