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

Change-Id: I8591d48e5d73510d16b1fb81d0fa9eded0eb7ef0