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

Change-Id: Id30f71995f5e0ec4f76fcc55c985b6244b2e1042