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

Change-Id: I436592642f8d2bc3bfd3713ef28dc72ce0c24690