Merge cherrypicks of ['googleplex-android-review.googlesource.com/24168505', 'googleplex-android-review.googlesource.com/24193668'] into udc-release.

Change-Id: I04ad95aff4326de414724d438459bd5d6f7ccd63