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

Change-Id: I9747ab0af6f78d6d9a17efbc4600986b32403067