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

Change-Id: I57c3a8152b3e8ae4dc3ec729d8d5c030c7fc46c0