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

Change-Id: Ied8f14294b9078b6abb02adf40a86bcebc9b9403