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

Change-Id: I96ee3409cc1600d26d2e97e83bbfffa9b441e74e