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

Change-Id: Iec7aeabc1f7b9e20f6dfbb19974c6298b5e904b9