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

Change-Id: I2b90d546895e80326e4e8c3e8737f71d059dae37