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

Change-Id: I4110953d371983e876e2fc2655b6eaaee5b41f28