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

Change-Id: Ibfabced6d02bb87fcb0098846cded35d7c613074