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

Change-Id: Ib6a1e8efd02894eec3e2dcb8be68dd9371176e09