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

Change-Id: I953848e075780dede2c8f02f332a14674d78c1ee