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

Change-Id: I72e95c24845597f104934cdd6ef660f1580540fc