Merge cherrypicks of ['googleplex-android-review.googlesource.com/24627343'] into udc-qpr1-release.

Change-Id: I73f0c9259f8b183c0d5ec7aa73278533d5405d59