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

Change-Id: Id37ae94069ded7ee0769d9a58e832286cb06fb54