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

Change-Id: I8b641f9a2592b2e3eeee9c4a500c518fb7069984